# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.15.49 -> 1.1046.15.50 # arch/i386/kernel/process.c 1.49 -> 1.49.1.1 # include/asm-alpha/hw_irq.h 1.2 -> 1.3 # include/linux/sched.h 1.142.1.1 -> 1.142.1.2 # arch/i386/kernel/traps.c 1.51.1.1 -> 1.51.1.2 # arch/alpha/kernel/traps.c 1.24 -> 1.25 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/06/03 jejb@raven.il.steeleye.com 1.1046.210.2 # Merge raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5 # into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5 # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.18 # Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin # into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core # -------------------------------------------- # 03/06/03 sam@mars.ravnborg.org 1.1046.211.1 # kbuild: Updated make help # # Patches originally by Adrian Bunk and Rudmer van Dijk. # Included "make V=0|1" and "make C=1" # -------------------------------------------- # 03/06/03 sam@mars.ravnborg.org 1.1046.211.2 # kbuild: Silence kbuild with make V=0 # # With make version 3.80 kbuild echo'ed the fixdep command # executed each time a c file was compiled. # This has been tracked down to a bug in version 3.80 of make. # Avoiding newlines in canned command sequences avoid this problem. # # At the same time consolidated similar code in Makefile.build, # and avoiding a few ifdef/endif pairs resulting in a more readable makefile. # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.19 # [driver model] Clean up CPU unregistration. # # From Dave Jones. # -------------------------------------------- # 03/06/03 sam@mars.ravnborg.org 1.1046.211.3 # kbuild: CROSS_COMPILE and ARCH definitions # # Patch originally by Jesse Barnes # # Previously the user were required to supply CROSS_COMPILE and ARCH on the # commandline to make, alternatively they patched the Makefile direct. # The following patch allows the user to specify the value of these in # a variable assigned during init or similar. # # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.20 # Driver Class: don't call put_device() when we never called get_device() # # From Greg: # # This fixes a oops when unplugging pci network devices. # -------------------------------------------- # 03/06/04 paulus@samba.org 1.1046.138.36 # Merge samba.org:/stuff/paulus/kernel/linux-2.5 # into samba.org:/stuff/paulus/kernel/for-linus-ppc # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.21 # [driver model] Clean up class release handling. # # Based on a patch by Stephen Hemminger. # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.22 # [kobject] Update Documentation and licenses. # # - Make it very explicit that supplying an object desctructor is imperative # if using the interface for object reference counting. # # - Add GPL statement to the source files. # # - Add GFL (http://www.fsf.org/licenses/fdl.html) statement to documentation. # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.23 # [driver model] Update copyrights and license statements. # # It's a slow afternoon. # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.24 # [driver model] fix comment in device.h # -------------------------------------------- # 03/06/03 ldm.adm@hostme.bitkeeper.com 1.1046.212.1 # Merge hostme.bitkeeper.com:/ua/repos/l/ldm/linux-2.5 # into hostme.bitkeeper.com:/ua/repos/l/ldm/linux-2.5-core # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.2 # [PATCH] PCI: make pci_setup_device(), pci_alloc_primary_bus() and pci_alloc_primary_bus_parented() static # # No one is calling these functions. # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.3 # [PATCH] PCI: make pools_lock and pci_lock static. # # No one is using them outside the pci core. # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.4 # [PATCH] ACPI PCI Hotplug: remove hand made pci_find_bus function # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.5 # [PATCH] IBM PCI hotplug: remove hand made pci_find_bus function. # -------------------------------------------- # 03/06/03 B.Zolnierkiewicz@elka.pw.edu.pl 1.1046.210.3 # [PATCH] create /proc/ide/hdX/capacity only once # # In ide_register_subdriver() create drive->proc entries only if driver is # not idedefault_driver. # # [ There won't be /proc/ide/hdX/capacity for devices attached # to idedefault_driver now, it reported 0x7fffffff previously. ] # # Do not create drive->proc entries in create_proc_ide_drives(), they are # added later in ide_register_subdriver(). # -------------------------------------------- # 03/06/03 B.Zolnierkiewicz@elka.pw.edu.pl 1.1046.210.4 # [PATCH] kill recreate_proc_ide_device() # # It is unused and not needed # -------------------------------------------- # 03/06/03 hawkes@oss.sgi.com 1.1046.210.5 # [PATCH] 2.5.70 remove smp_send_reschedule() cruft # # smp_send_reschedule_all() is unused in 2.5 and can be eliminated. # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.25 # Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin # into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core # -------------------------------------------- # 03/06/03 mochel@osdl.org 1.1046.177.26 # Merge bk://ldm@bkbits.net/linux-2.5-core # into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core # -------------------------------------------- # 03/06/03 ahaas@airmail.net 1.1046.210.6 # [PATCH] C99 patches for fs/ # # Add C99 initializers to fs/bio.c and fs/dquot.c. And fs/libfs.c had an # obsolete GCC style initialzers that is converted to C99 style. # -------------------------------------------- # 03/06/03 ahaas@airmail.net 1.1046.210.7 # [PATCH] C99 struct initializers for kernel files # -------------------------------------------- # 03/06/03 torvalds@home.transmeta.com 1.1046.177.27 # Merge bk://ldm.bkbits.net/linux-2.5-core # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/06/04 anton@samba.org 1.1046.202.17 # Merge samba.org:/scratch/anton/linux-2.5 # into samba.org:/scratch/anton/tmp3 # -------------------------------------------- # 03/06/04 anton@samba.org 1.1072 # Merge samba.org:/scratch/anton/tmp3 into samba.org:/scratch/anton/export # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.6 # [PATCH] IBM PCI hotplug: remove direct access of pci_devices variable. # -------------------------------------------- # 03/06/04 anton@samba.org 1.1046.177.28 # Merge samba.org:/scratch/anton/linux-2.5 # into samba.org:/scratch/anton/tmp3 # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.7 # PCI Hotplug: move drivers/hotplug/* to drivers/pci/hotplug/* # # This will let include/linux/pci.h get smaller, and is what I should # have done in the first place 2 years ago... # -------------------------------------------- # 03/06/03 davem@nuts.ninka.net 1.1046.213.1 # Merge bk://kernel.bkbits.net/acme/net-2.5 # into nuts.ninka.net:/home/davem/src/BK/net-2.5 # -------------------------------------------- # 03/06/03 chas@cmf.nrl.navy.mil 1.1046.213.2 # [ATM]: more cleanup in HE driver # -------------------------------------------- # 03/06/03 davem@nuts.ninka.net 1.1046.213.3 # [NET]: Use INIT_LIST_HEAD correctly in arch/um/drivers/net_kern.c # -------------------------------------------- # 03/06/03 rddunlap@osdl.org 1.1046.213.4 # [NET]: add RFC references for Linux SNMP MIBs. # -------------------------------------------- # 03/06/03 rddunlap@osdl.org 1.1046.213.5 # [NET]: Typo corrections only. # -------------------------------------------- # 03/06/03 rddunlap@osdl.org 1.1046.213.6 # [IPV6]: Add IPv6 routing table statistic: fib_discarded_routes. # -------------------------------------------- # 03/06/03 yoshfuji@linux-ipv6.org 1.1046.213.7 # [NET]: Add ip-sysctl.txt entries for missing ip{,6}frag_* sysctls. # -------------------------------------------- # 03/06/03 hch@lst.de 1.1046.213.8 # [NET]: Move dmascc away from setup.c # -------------------------------------------- # 03/06/03 yoshfuji@linux-ipv6.org 1.1046.213.9 # [IPV6]: Set dead flag on idev if snmp6_register_dev() fails. # -------------------------------------------- # 03/06/03 davem@nuts.ninka.net 1.1046.213.10 # [IPSEC]: {esp,ah} --> {esp4,ah4}. # -------------------------------------------- # 03/06/03 hch@lst.de 1.1046.213.11 # [NET]: Fix non-modular sdla.c build. # -------------------------------------------- # 03/06/03 yoshfuji@linux-ipv6.org 1.1046.213.12 # [IPV6]: Fix several errors in udpv6_connect(). # # - Pointer within an automatic storage class variable fl was illegally # cached using ip6_dst_store() # - uninitialized saddr was copied to fl.fl6_src # - dont cache if ipv6_saddr_get() failed. # # Based upon patch from Ville Nuorvala (vnuorval@tcs.hut.fi) # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.8 # [PATCH] PCI: Remove a lot of PCI core only functions from include/linux/pci.h # -------------------------------------------- # 03/06/03 jmorris@intercode.com.au 1.1046.213.13 # [CRYPTO]: Use "select" kconfig facility instead of fragile defaults. # -------------------------------------------- # 03/06/03 greg@kroah.com 1.1046.185.9 # [PATCH] PCI: remove CONFIG_PROC_FS checks in .c files. # -------------------------------------------- # 03/06/03 davidm@wailua.hpl.hp.com 1.1046.15.50 # Adjust show_trace()/show_stack() interfce to make them truly portable: # first arg is task whose trace should be shown, second arg is stack # pointer value starting from which the trace should be shown. Either # (or both) arguments can be NULL. # -------------------------------------------- # diff -Nru a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c --- a/arch/alpha/kernel/traps.c Mon Sep 22 13:03:36 2003 +++ b/arch/alpha/kernel/traps.c Mon Sep 22 13:03:36 2003 @@ -148,7 +148,7 @@ static int kstack_depth_to_print = 24; -void show_stack(unsigned long *sp) +void show_stack(struct task_struct *task, unsigned long *sp) { unsigned long *stack; int i; @@ -174,7 +174,7 @@ void dump_stack(void) { - show_stack(NULL); + show_stack(NULL, NULL); } void diff -Nru a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c --- a/arch/i386/kernel/process.c Mon Sep 22 13:03:36 2003 +++ b/arch/i386/kernel/process.c Mon Sep 22 13:03:36 2003 @@ -190,7 +190,7 @@ ".previous \n" : "=r" (cr4): "0" (0)); printk("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", cr0, cr2, cr3, cr4); - show_trace(®s->esp); + show_trace(NULL, ®s->esp); } /* diff -Nru a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c --- a/arch/i386/kernel/traps.c Mon Sep 22 13:03:36 2003 +++ b/arch/i386/kernel/traps.c Mon Sep 22 13:03:36 2003 @@ -92,15 +92,13 @@ static int kstack_depth_to_print = 24; -void show_trace(struct task_struct *task) +void show_trace(struct task_struct *task, unsigned long * stack) { int i; - unsigned long addr, *stack; + unsigned long addr; - if (!task) - stack = (unsigned long*)&task; - else - stack = (unsigned long *) task->thread.esp; + if (!stack) + stack = (unsigned long*)&stack; printk("Call Trace:"); #if CONFIG_KALLSYMS @@ -124,21 +122,19 @@ /* User space on another CPU? */ if ((esp ^ (unsigned long)tsk->thread_info) & (PAGE_MASK<<1)) return; - show_trace(tsk); + show_trace(tsk, (unsigned long *)esp); } -void show_stack(struct task_struct *task) +void show_stack(struct task_struct *task, unsigned long * esp) { - unsigned long *stack, *esp; + unsigned long *stack; int i; // debugging aid: "show_stack(NULL);" prints the // back trace for this cpu. - if(task==NULL) - esp=(unsigned long*)&task; - else - esp = (unsigned long*)task->thread.esp; + if(esp==NULL) + esp=(unsigned long*)&esp; stack = esp; for(i=0; i < kstack_depth_to_print; i++) { @@ -149,7 +145,7 @@ printk("%08lx ", *stack++); } printk("\n"); - show_trace(task); + show_trace(task, esp); } /* @@ -157,7 +153,9 @@ */ void dump_stack(void) { - show_trace(NULL); + unsigned long stack; + + show_trace(current, &stack); } void show_registers(struct pt_regs *regs) @@ -194,7 +192,7 @@ if (in_kernel) { printk("\nStack: "); - show_stack(NULL); + show_stack(NULL, (unsigned long*)esp); printk("Code: "); if(regs->eip < PAGE_OFFSET) diff -Nru a/include/asm-alpha/hw_irq.h b/include/asm-alpha/hw_irq.h --- a/include/asm-alpha/hw_irq.h Mon Sep 22 13:03:36 2003 +++ b/include/asm-alpha/hw_irq.h Mon Sep 22 13:03:36 2003 @@ -13,4 +13,6 @@ #define ACTUAL_NR_IRQS NR_IRQS #endif +extern irq_desc_t irq_desc [NR_IRQS]; + #endif diff -Nru a/include/linux/sched.h b/include/linux/sched.h --- a/include/linux/sched.h Mon Sep 22 13:03:36 2003 +++ b/include/linux/sched.h Mon Sep 22 13:03:36 2003 @@ -148,8 +148,8 @@ extern void init_idle(task_t *idle, int cpu); extern void show_state(void); -extern void show_trace(struct task_struct *); -extern void show_stack(struct task_struct *); +extern void show_trace(struct task_struct *, unsigned long *); +extern void show_stack(struct task_struct *, unsigned long *); extern void show_regs(struct pt_regs *); void io_schedule(void);